From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Sat, 16 Feb 2013 18:43:01 +0000 (-0500)
Subject: popupMenu: Close all child menus when the main menu is closed
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4780
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=809295c03d2a1a7a555529685574af509e3fae94;p=gnome-shell.git

popupMenu: Close all child menus when the main menu is closed

Otherwise, if something managed to call close(), it wouldn't
close any child menus.

https://bugzilla.gnome.org/show_bug.cgi?id=693572
---

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 538d9b6e5..d65f03f21 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -1267,6 +1267,10 @@ const PopupMenu = new Lang.Class({
         if (this._activeMenuItem)
             this._activeMenuItem.setActive(false);
 
+        this._childMenus.forEach(function(childMenu) {
+            childMenu.close();
+        });
+
         if (this._boxPointer.actor.visible)
             this._boxPointer.hide(animate);